diff --git a/generate_vendor_package.sh b/generate_vendor_package.sh
index 6d2ea24..82e8df6 100755
--- a/generate_vendor_package.sh
+++ b/generate_vendor_package.sh
@@ -24,6 +24,9 @@
   echo "TARGET_LINARO_VENDOR_VERSION := $VER" > $DEV_TARGET_DIR/version.mk
 done
 
+# Delete unnecessary files copied from mesa_prebuilt/
+rm $TARGET_DIR/shared/$VER/mesa_prebuilt/{copy_bins.sh,README_UpdateMesaPrebuilts}
+
 # Copy the toplevel items
 cp $SRC_DIR/README		$TARGET_DIR/
 cp $SRC_DIR/android-info.txt	$TARGET_DIR/
diff --git a/src/README b/src/README
index f9918a2..458c542 100644
--- a/src/README
+++ b/src/README
@@ -23,7 +23,8 @@
     │   │
     │   └── mesa_prebuilt/
     │       Upstream Mesa prebuiilt binaries (covered under original LICENSE) are built from
-    │       https://android.googlesource.com/platform/external/mesa3d/+/refs/tags/upstream-mesa-24.1.4
+    │       https://android.googlesource.com/platform/external/mesa3d/+log/refs/heads/upstream-main
+    │       HEAD: 2d2bc5b307f9 ("android: simplify building libgallium_dri on Android")
     │
     ├── db845c/
     │   ├── dragonboard-845c-bootloader-ufs-aosp/
diff --git a/src/shared/mesa_prebuilt/Android.mk b/src/shared/mesa_prebuilt/Android.mk
index cde8979..ac96e0f 100644
--- a/src/shared/mesa_prebuilt/Android.mk
+++ b/src/shared/mesa_prebuilt/Android.mk
@@ -62,7 +62,7 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libgallium_dri
-LOCAL_MODULE_RELATIVE_PATH := dri
+LOCAL_MODULE_RELATIVE_PATH :=
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-MIT
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
@@ -76,8 +76,6 @@
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MULTILIB := both
-LOCAL_MODULE_SYMLINKS := msm_dri.so
-LOCAL_MODULE_SYMLINKS += zink_dri.so
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -96,7 +94,6 @@
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MULTILIB := both
-LOCAL_MODULE_SYMLINKS=$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX).0
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -115,7 +112,6 @@
 LOCAL_CHECK_ELF_FILES := false
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MULTILIB := both
-LOCAL_MODULE_SYMLINKS=$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX).0
 include $(BUILD_PREBUILT)
 
 endif
diff --git a/src/shared/mesa_prebuilt/copy_bins.sh b/src/shared/mesa_prebuilt/copy_bins.sh
index b0e8a88..15b264f 100755
--- a/src/shared/mesa_prebuilt/copy_bins.sh
+++ b/src/shared/mesa_prebuilt/copy_bins.sh
@@ -7,19 +7,17 @@
 
 mkdir -p lib64/egl
 mkdir -p lib/egl
-mkdir -p lib64/dri
-mkdir -p lib/dri
 mkdir -p lib64/hw
 mkdir -p lib/hw
 
 cp -P $ANDROID_PRODUCT_OUT/vendor/lib64/egl/*			lib64/egl/
 cp -P $ANDROID_PRODUCT_OUT/vendor/lib/egl/*			lib/egl/
-cp -P $ANDROID_PRODUCT_OUT/vendor/lib64/dri/libgallium_dri*	lib64/dri/
-cp -P $ANDROID_PRODUCT_OUT/vendor/lib/dri/libgallium_dri*	lib/dri/
 
 cp $ANDROID_PRODUCT_OUT/vendor/lib64/hw/vulkan.freedreno.so	lib64/hw/
 cp $ANDROID_PRODUCT_OUT/vendor/lib/hw/vulkan.freedreno.so	lib/hw/
 
+cp $ANDROID_PRODUCT_OUT/vendor/lib64/libgallium_dri.so		lib64/libgallium_dri.so
 cp $ANDROID_PRODUCT_OUT/vendor/lib64/libglapi.so		lib64/libglapi.so
+cp $ANDROID_PRODUCT_OUT/vendor/lib/libgallium_dri.so		lib/libgallium_dri.so
 cp $ANDROID_PRODUCT_OUT/vendor/lib/libglapi.so			lib/libglapi.so
 
diff --git a/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so b/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so
deleted file mode 100755
index 9e34648..0000000
--- a/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so
+++ /dev/null
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so.0 b/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so.0
deleted file mode 120000
index a396173..0000000
--- a/src/shared/mesa_prebuilt/lib/dri/libgallium_dri.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgallium_dri.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so b/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so
index 9d75160..7fcb70e 100755
--- a/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so
+++ b/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so.1 b/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so.1
deleted file mode 120000
index b596ccb..0000000
--- a/src/shared/mesa_prebuilt/lib/egl/libEGL_mesa.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libEGL_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib/egl/libGLESv1_CM_mesa.so.1 b/src/shared/mesa_prebuilt/lib/egl/libGLESv1_CM_mesa.so.1
deleted file mode 120000
index aaa91a1..0000000
--- a/src/shared/mesa_prebuilt/lib/egl/libGLESv1_CM_mesa.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libGLESv1_CM_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib/egl/libGLESv2_mesa.so.2 b/src/shared/mesa_prebuilt/lib/egl/libGLESv2_mesa.so.2
deleted file mode 120000
index 94fb549..0000000
--- a/src/shared/mesa_prebuilt/lib/egl/libGLESv2_mesa.so.2
+++ /dev/null
@@ -1 +0,0 @@
-libGLESv2_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib/hw/vulkan.freedreno.so b/src/shared/mesa_prebuilt/lib/hw/vulkan.freedreno.so
index 22b25d1..09c89e7 100755
--- a/src/shared/mesa_prebuilt/lib/hw/vulkan.freedreno.so
+++ b/src/shared/mesa_prebuilt/lib/hw/vulkan.freedreno.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib/libgallium_dri.so b/src/shared/mesa_prebuilt/lib/libgallium_dri.so
new file mode 100755
index 0000000..07ba46f
--- /dev/null
+++ b/src/shared/mesa_prebuilt/lib/libgallium_dri.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib/libglapi.so b/src/shared/mesa_prebuilt/lib/libglapi.so
index f7a8a04..52120cd 100755
--- a/src/shared/mesa_prebuilt/lib/libglapi.so
+++ b/src/shared/mesa_prebuilt/lib/libglapi.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so b/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so
deleted file mode 100755
index dac8bc3..0000000
--- a/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so
+++ /dev/null
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so.0 b/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so.0
deleted file mode 120000
index a396173..0000000
--- a/src/shared/mesa_prebuilt/lib64/dri/libgallium_dri.so.0
+++ /dev/null
@@ -1 +0,0 @@
-libgallium_dri.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so b/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so
index ef2e7bf..2dbb2fe 100755
--- a/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so
+++ b/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so.1 b/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so.1
deleted file mode 120000
index b596ccb..0000000
--- a/src/shared/mesa_prebuilt/lib64/egl/libEGL_mesa.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libEGL_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib64/egl/libGLESv1_CM_mesa.so.1 b/src/shared/mesa_prebuilt/lib64/egl/libGLESv1_CM_mesa.so.1
deleted file mode 120000
index aaa91a1..0000000
--- a/src/shared/mesa_prebuilt/lib64/egl/libGLESv1_CM_mesa.so.1
+++ /dev/null
@@ -1 +0,0 @@
-libGLESv1_CM_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib64/egl/libGLESv2_mesa.so.2 b/src/shared/mesa_prebuilt/lib64/egl/libGLESv2_mesa.so.2
deleted file mode 120000
index 94fb549..0000000
--- a/src/shared/mesa_prebuilt/lib64/egl/libGLESv2_mesa.so.2
+++ /dev/null
@@ -1 +0,0 @@
-libGLESv2_mesa.so
\ No newline at end of file
diff --git a/src/shared/mesa_prebuilt/lib64/hw/vulkan.freedreno.so b/src/shared/mesa_prebuilt/lib64/hw/vulkan.freedreno.so
index 2c3cca5..496c065 100755
--- a/src/shared/mesa_prebuilt/lib64/hw/vulkan.freedreno.so
+++ b/src/shared/mesa_prebuilt/lib64/hw/vulkan.freedreno.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib64/libgallium_dri.so b/src/shared/mesa_prebuilt/lib64/libgallium_dri.so
new file mode 100755
index 0000000..05925a0
--- /dev/null
+++ b/src/shared/mesa_prebuilt/lib64/libgallium_dri.so
Binary files differ
diff --git a/src/shared/mesa_prebuilt/lib64/libglapi.so b/src/shared/mesa_prebuilt/lib64/libglapi.so
index d77f62d..f8255e2 100755
--- a/src/shared/mesa_prebuilt/lib64/libglapi.so
+++ b/src/shared/mesa_prebuilt/lib64/libglapi.so
Binary files differ